Skip to content

Commit 748bb57

Browse files
authored
Merge branch 'master' into all-contributors/add-waninir
2 parents a38b4f7 + 19b1eda commit 748bb57

7 files changed

Lines changed: 55 additions & 2 deletions

File tree

.all-contributorsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,33 @@
213213
"contributions": [
214214
"code"
215215
]
216+
},
217+
{
218+
"login": "creativeyashi",
219+
"name": "Yashika Gupta",
220+
"avatar_url": "https://avatars2.githubusercontent.com/u/56039343?v=4",
221+
"profile": "https://github.com/creativeyashi",
222+
"contributions": [
223+
"code"
224+
]
225+
},
226+
{
227+
"login": "VictordaSiIva",
228+
"name": "Victor da Silva",
229+
"avatar_url": "https://avatars3.githubusercontent.com/u/40555247?v=4",
230+
"profile": "https://www.linkedin.com/in/victor-da-silva-a75951138/",
231+
"contributions": [
232+
"code"
233+
]
234+
},
235+
{
236+
"login": "errazudin",
237+
"name": "errazudin ishak",
238+
"avatar_url": "https://avatars2.githubusercontent.com/u/539687?v=4",
239+
"profile": "https://github.com/errazudin",
240+
"contributions": [
241+
"code"
242+
]
216243
}
217244
],
218245
"contributorsPerLine": 7,

Books/readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
16. [Research Guide Containers](research-guide-containers.pdf)
1919
17. [Research Guide Devops](research-guide-devops.pdf)
2020
18. [Trend Reports Kubernetes in the Enterprise](trend-report-kubernetes-in-the-enterprise.pdf)
21+
19. [Securing DevOps] (securing-devops.pdf)
2122

2223
******
2324
## Resources :

Books/securing-devops.pdf

12.2 MB
Binary file not shown.

Cloud_providers/Azure/Introduction

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#Introduction
2+
Azure is Microsoft’s cloud platform, just like Google has it’s Google Cloud and Amazon has it’s Amazon Web Service or AWS.000. Generally, it is a platform through which we can use Microsoft’s resource. For example, to set up a huge server, we will require huge investment, effort, physical space and so on. In such situations, Microsoft Azure comes to our rescue. It will provide us with virtual machines, fast processing of data, analytical and monitoring tools and so on to make our work simpler. The pricing of Azure is also simpler and cost-effective. Popularly termed as “Pay As You Go”, which means how much you use, pay only for that.
3+
4+
5+
6+
#Azure History
7+
Microsoft unveiled Windows Azure in early October 2008 but it went to live after February 2010. Later in 2014, Microsoft changed its name from Windows Azure to Microsoft Azure. Azure provided a service platform for .NET services, SQL Services, and many Live Services. Many people were still very skeptical about “the cloud”. As an industry, we were entering a brave new world with many possibilities. Microsoft Azure is getting bigger and better in coming days. More tools and more functionalities are getting added. It has two releases as of now. It’s famous version Micorosft Azure v1 and later Microsoft Azure v2. Microsoft Azure v1 was more like JSON script driven then the new version v2, which has interactive UI for simplification and easy learning. Microsoft Azure v2 is still in the preview version
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#Microsoft Azure Services
2+
3+
Some following are the services of Microsoft Azure offers:
4+
5+
1. Compute: Includes Virtual Machines, Virtual Machine Scale Sets, Functions for serverless computing, Batch for containerized batch workloads, Service Fabric for microservices and container orchestration, and Cloud Services for building cloud-based apps and APIs.
6+
2. Networking: With Azure you can use variety of networking tools, like the Virtual Network, which can connect to on-premise data centers; Load Balancer; Application Gateway; VPN Gateway; Azure DNS for domain hosting, Content Delivery Network, Traffic Manager, ExpressRoute dedicated private network fiber connections; and Network Watcher monitoring and diagnostics
7+
3. Storage: Includes Blob, Queue, File and Disk Storage, as well as a Data Lake Store, Backup and Site Recovery, among others.
8+
4. Web + Mobile: Creating Web + Mobile applications is very easy as it includes several services for building and deploying applications.
9+
5. Containers: Azure has a property which includes Container Service, which supports Kubernetes, DC/OS or Docker Swarm, and Container Registry, as well as tools for microservices.
10+
6. Databases: Azure has also includes several SQL-based databases and related tools.
11+
7. Data + Analytics: Azure has some big data tools like HDInsight for Hadoop Spark, R Server, HBase and Storm clusters
12+
8. AI + Cognitive Services: With Azure developing applications with artificial intelligence capabilities, like the Computer Vision API, Face API, Bing Web Search, Video Indexer, Language Understanding Intelligent.
13+
9. Internet of Things: Includes IoT Hub and IoT Edge services that can be combined with a variety of machine learning, analytics, and communications services.
14+
10. Security + Identity: Includes Security Center, Azure Active Directory, Key Vault and Multi-Factor Authentication Services.
15+
11. Developer Tools: Includes cloud development services like Visual Studio Team Services, Azure DevTest Labs, HockeyApp mobile app deployment and monitoring, Xamarin cross-platform mobile development and more.
16+

Container-orchestration/Docker/node/views/css/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
body {
6-
background: #020A1B;
6+
background: green;
77
color: #ffffff;
88
font-family: 'Merriweather', sans-serif;
99
}

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
143143
<tr>
144144
<td align="center"><a href="https://milindchawre.github.io/"><img src="https://avatars0.githubusercontent.com/u/21288765?v=4" width="100px;" alt=""/><br /><sub><b>Milind Chawre</b></sub></a><br /><a href="https://github.com/Tikam02/DevOps-Guide/commits?author=milindchawre" title="Code">💻</a></td>
145145
<td align="center"><a href="http://lnfnunes.com.br"><img src="https://avatars1.githubusercontent.com/u/2450417?v=4" width="100px;" alt=""/><br /><sub><b>Leandro Nunes</b></sub></a><br /><a href="https://github.com/Tikam02/DevOps-Guide/commits?author=lnfnunes" title="Code">💻</a></td>
146-
146+
<td align="center"><a href="https://github.com/creativeyashi"><img src="https://avatars2.githubusercontent.com/u/56039343?v=4" width="100px;" alt=""/><br /><sub><b>Yashika Gupta</b></sub></a><br /><a href="https://github.com/Tikam02/DevOps-Guide/commits?author=creativeyashi" title="Code">💻</a></td>
147+
<td align="center"><a href="https://www.linkedin.com/in/victor-da-silva-a75951138/"><img src="https://avatars3.githubusercontent.com/u/40555247?v=4" width="100px;" alt=""/><br /><sub><b>Victor da Silva</b></sub></a><br /><a href="https://github.com/Tikam02/DevOps-Guide/commits?author=VictordaSiIva" title="Code">💻</a></td>
148+
<td align="center"><a href="https://github.com/errazudin"><img src="https://avatars2.githubusercontent.com/u/539687?v=4" width="100px;" alt=""/><br /><sub><b>errazudin ishak</b></sub></a><br /><a href="https://github.com/Tikam02/DevOps-Guide/commits?author=errazudin" title="Code">💻</a></td>
147149
</tr>
148150
</table>
149151

0 commit comments

Comments
 (0)